arch: riscv: Use CONFIG_PMP_SLOTS for M-mode stack guard arrays #97077
+4
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zephyrbot
added
area: RISCV
zephyrbot
requested review from
dcpleung,
edersondisouza,
fkokosinski,
katsuster,
kgugala,
masz-nordic,
mgielda,
nashif,
npitre,
tgorochowik,
VynDragon and
ycsin
dcpleung
previously approved these changes
Oct 6, 2025
nashif
reviewed
Oct 7, 2025
| }; | ||
| typedef struct z_riscv_fp_context z_riscv_fp_context_t; | ||
|
|
||
| #define PMP_M_MODE_SLOTS 8 /* 8 is plenty enough for m-mode */ |
There was a problem hiding this comment.
shouldnt we change this to also be set by the kconfig?
There was a problem hiding this comment.
I replaced all 4 instances of the deprecated PMP_M_MODE_SLOTS with CONFIG_PMP_SLOTS. The unused PMP_M_MODE_SLOTS definition has been removed. All functional tests are passing, but the change is currently failing the [E Reliability Rating on New Code] check. I'm unsure of the specific requirement this check entails and would appreciate guidance on how to resolve the failure.
fsammoura1980
force-pushed
the
test_thread
branch
from
b0e7362 to
88999cd
Compare
The arrays used for M-mode Physical Memory Protection (PMP), specifically for the stack guard feature (CONFIG_PMP_STACK_GUARD), were previously sized using the hardcoded PMP_M_MODE_SLOTS macro, defined as 8. This affected arrays in both the _thread_arch struct (m_mode_pmpaddr_regs, m_mode_pmpcfg_regs) and local variables within the z_riscv_pmp_stackguard_disable function. This commit changes the array sizing to use the Kconfig option CONFIG_PMP_SLOTS. This option reflects the total number of PMP slots available and configured for the target hardware. Using CONFIG_PMP_SLOTS ensures these arrays are dimensioned according to the system's actual capabilities, providing better flexibility and correctness over a fixed size. The PMP_M_MODE_SLOTS macro definition has been removed from thread.h as it is no longer used. Signed-off-by: Firas Sammoura <[email protected]>
fsammoura1980
force-pushed
the
test_thread
branch
from
88999cd to
d39ca1a
Compare
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The arrays used for M-mode Physical Memory Protection (PMP), specifically for the stack guard feature (
CONFIG_PMP_STACK_GUARD), were previously sized using the hardcodedPMP_M_MODE_SLOTSmacro, defined as 8. This affected arrays in both the_thread_archstruct (m_mode_pmpaddr_regs,m_mode_pmpcfg_regs) and local variables within thez_riscv_pmp_stackguard_disablefunction.This commit changes the array sizing to use the Kconfig option
CONFIG_PMP_SLOTS. This option reflects the total number of PMP slots available and configured for the target hardware.Using
CONFIG_PMP_SLOTSensures these arrays are dimensioned according to the system's actual capabilities, providing better flexibility and correctness over a fixed size.The
PMP_M_MODE_SLOTSmacro definition has been removed from thread.h as it is no longer used.